Remove, as this is a file generated by configure (or copied from
authorTor Lillqvist <tml@iki.fi>
Sun, 21 Nov 1999 22:56:37 +0000 (22:56 +0000)
committerTor Lillqvist <tml@src.gnome.org>
Sun, 21 Nov 1999 22:56:37 +0000 (22:56 +0000)
1999-11-21  Tor Lillqvist  <tml@iki.fi>

* gdk/gdkconfig.h: Remove, as this is a file generated by configure
(or copied from gdkconfig.h.win32 on Win32, sigh).

* gdk/gdkprivate.h: Mark gdk_parent_root for export from DLL.

* gdk/gdkgc.c (gdk_gc_alloc): Remove duplicated line.

21 files changed:
ChangeLog
ChangeLog.pre-2-0
ChangeLog.pre-2-10
ChangeLog.pre-2-2
ChangeLog.pre-2-4
ChangeLog.pre-2-6
ChangeLog.pre-2-8
gdk/gdk.def
gdk/gdkconfig.h [deleted file]
gdk/gdkgc.c
gdk/gdkprivate.h
gdk/win32/gdk-win32.def [deleted file]
gdk/win32/gdkconfig.h [deleted file]
gdk/win32/gdkdrawable-win32.c
gdk/win32/gdkevents-win32.c
gdk/win32/gdkfont-win32.c
gdk/win32/gdkgc-win32.c
gdk/win32/gdkprivate-win32.h
gdk/win32/gdkwin32.h
gdk/win32/gdkwindow-win32.c
gdk/win32/makefile.cygwin

index e8202df33c6421551743b72360e8ac251fa16c28..22c6c80967fd3f0e88a20a87637a21360809aa99 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,14 @@
 1999-11-21  Tor Lillqvist  <tml@iki.fi>
 
+       * gdk/gdkconfig.h: Remove, as this is a file generated by configure
+       (or copied from gdkconfig.h.win32 on Win32, sigh).
+
+       * gdk/gdkprivate.h: Mark gdk_parent_root for export from DLL.
+
        * gdk/gdk.c (gdk_keyval_convert_case): Fix typo.
 
+       * gdk/gdkgc.c (gdk_gc_alloc): Remove duplicated line.
+
        * gdk/gdkconfig.h.win32: New file.
 
        * gdk/win32/makefile.cygwin: Build just a static archive here.
index e8202df33c6421551743b72360e8ac251fa16c28..22c6c80967fd3f0e88a20a87637a21360809aa99 100644 (file)
@@ -1,7 +1,14 @@
 1999-11-21  Tor Lillqvist  <tml@iki.fi>
 
+       * gdk/gdkconfig.h: Remove, as this is a file generated by configure
+       (or copied from gdkconfig.h.win32 on Win32, sigh).
+
+       * gdk/gdkprivate.h: Mark gdk_parent_root for export from DLL.
+
        * gdk/gdk.c (gdk_keyval_convert_case): Fix typo.
 
+       * gdk/gdkgc.c (gdk_gc_alloc): Remove duplicated line.
+
        * gdk/gdkconfig.h.win32: New file.
 
        * gdk/win32/makefile.cygwin: Build just a static archive here.
index e8202df33c6421551743b72360e8ac251fa16c28..22c6c80967fd3f0e88a20a87637a21360809aa99 100644 (file)
@@ -1,7 +1,14 @@
 1999-11-21  Tor Lillqvist  <tml@iki.fi>
 
+       * gdk/gdkconfig.h: Remove, as this is a file generated by configure
+       (or copied from gdkconfig.h.win32 on Win32, sigh).
+
+       * gdk/gdkprivate.h: Mark gdk_parent_root for export from DLL.
+
        * gdk/gdk.c (gdk_keyval_convert_case): Fix typo.
 
+       * gdk/gdkgc.c (gdk_gc_alloc): Remove duplicated line.
+
        * gdk/gdkconfig.h.win32: New file.
 
        * gdk/win32/makefile.cygwin: Build just a static archive here.
index e8202df33c6421551743b72360e8ac251fa16c28..22c6c80967fd3f0e88a20a87637a21360809aa99 100644 (file)
@@ -1,7 +1,14 @@
 1999-11-21  Tor Lillqvist  <tml@iki.fi>
 
+       * gdk/gdkconfig.h: Remove, as this is a file generated by configure
+       (or copied from gdkconfig.h.win32 on Win32, sigh).
+
+       * gdk/gdkprivate.h: Mark gdk_parent_root for export from DLL.
+
        * gdk/gdk.c (gdk_keyval_convert_case): Fix typo.
 
+       * gdk/gdkgc.c (gdk_gc_alloc): Remove duplicated line.
+
        * gdk/gdkconfig.h.win32: New file.
 
        * gdk/win32/makefile.cygwin: Build just a static archive here.
index e8202df33c6421551743b72360e8ac251fa16c28..22c6c80967fd3f0e88a20a87637a21360809aa99 100644 (file)
@@ -1,7 +1,14 @@
 1999-11-21  Tor Lillqvist  <tml@iki.fi>
 
+       * gdk/gdkconfig.h: Remove, as this is a file generated by configure
+       (or copied from gdkconfig.h.win32 on Win32, sigh).
+
+       * gdk/gdkprivate.h: Mark gdk_parent_root for export from DLL.
+
        * gdk/gdk.c (gdk_keyval_convert_case): Fix typo.
 
+       * gdk/gdkgc.c (gdk_gc_alloc): Remove duplicated line.
+
        * gdk/gdkconfig.h.win32: New file.
 
        * gdk/win32/makefile.cygwin: Build just a static archive here.
index e8202df33c6421551743b72360e8ac251fa16c28..22c6c80967fd3f0e88a20a87637a21360809aa99 100644 (file)
@@ -1,7 +1,14 @@
 1999-11-21  Tor Lillqvist  <tml@iki.fi>
 
+       * gdk/gdkconfig.h: Remove, as this is a file generated by configure
+       (or copied from gdkconfig.h.win32 on Win32, sigh).
+
+       * gdk/gdkprivate.h: Mark gdk_parent_root for export from DLL.
+
        * gdk/gdk.c (gdk_keyval_convert_case): Fix typo.
 
+       * gdk/gdkgc.c (gdk_gc_alloc): Remove duplicated line.
+
        * gdk/gdkconfig.h.win32: New file.
 
        * gdk/win32/makefile.cygwin: Build just a static archive here.
index e8202df33c6421551743b72360e8ac251fa16c28..22c6c80967fd3f0e88a20a87637a21360809aa99 100644 (file)
@@ -1,7 +1,14 @@
 1999-11-21  Tor Lillqvist  <tml@iki.fi>
 
+       * gdk/gdkconfig.h: Remove, as this is a file generated by configure
+       (or copied from gdkconfig.h.win32 on Win32, sigh).
+
+       * gdk/gdkprivate.h: Mark gdk_parent_root for export from DLL.
+
        * gdk/gdk.c (gdk_keyval_convert_case): Fix typo.
 
+       * gdk/gdkgc.c (gdk_gc_alloc): Remove duplicated line.
+
        * gdk/gdkconfig.h.win32: New file.
 
        * gdk/win32/makefile.cygwin: Build just a static archive here.
index 2dc9ce0edcaaed88f124dfebf19196832b8d5176..c1ae95c52c886dfad73b4ad2426981899ce06e1a 100644 (file)
@@ -16,6 +16,19 @@ EXPORTS
        gdk_color_hash
        gdk_color_parse
        gdk_color_white
+       gdk_color_context_add_palette
+       gdk_color_context_free
+       gdk_color_context_free_dither
+       gdk_color_context_get_index_from_palette
+       gdk_color_context_get_pixel
+       gdk_color_context_get_pixel_from_palette
+       gdk_color_context_get_pixels
+       gdk_color_context_get_pixels_incremental
+       gdk_color_context_init_dither
+       gdk_color_context_new
+       gdk_color_context_new_mono
+       gdk_color_context_query_color
+       gdk_color_context_query_colors
        gdk_colormap_alloc_color
        gdk_colormap_alloc_colors
        gdk_colormap_change
@@ -185,6 +198,7 @@ EXPORTS
        gdk_list_visuals
        gdk_mbstowcs
        gdk_null_window_warnings
+       gdk_parent_root
        gdk_pixmap_colormap_create_from_xpm
        gdk_pixmap_colormap_create_from_xpm_d
        gdk_pixmap_create_from_data
@@ -322,3 +336,4 @@ EXPORTS
        gdk_window_shape_combine_mask
        gdk_window_show
        gdk_window_withdraw
+       gdk_xid_table_lookup
diff --git a/gdk/gdkconfig.h b/gdk/gdkconfig.h
deleted file mode 100644 (file)
index 67c1a71..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/* gdkconfig.h
- *
- * This is a generated file.  Please modify `configure.in'
- */
-
-#ifndef GDKCONFIG_H
-#define GDKCONFIG_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#define GDK_WINDOWING_X11
-
-#define GDK_HAVE_WCHAR_H 1
-#define GDK_HAVE_WCTYPE_H 1
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* GDKCONFIG_H */
index 11a6c2852f9e7380b2f4504f21b854763a9c352b..05b7d96a530780ad3deca0aed421e01db9f659d1 100644 (file)
@@ -37,7 +37,6 @@ gdk_gc_alloc (void)
   private = g_new (GdkGCPrivate, 1);
   private->ref_count = 1;
   private->klass = NULL;
-  private->klass = NULL;
   private->klass_data = NULL;
 
   return (GdkGC *)private;
index 833f078c45062e84e5e901ce9ca1671ed1472b4d..1ddb5914ff0547666232c4eefafa64ae0c9f8791 100644 (file)
@@ -249,7 +249,7 @@ void gdk_dnd_display_drag_cursor(gint x,
 extern gint             gdk_debug_level;
 extern gboolean                 gdk_show_events;
 extern gint             gdk_screen;
-extern GdkWindow       *gdk_parent_root;
+GDKVAR GdkWindow       *gdk_parent_root;
 extern gint             gdk_error_code;
 extern gint             gdk_error_warnings;
 extern GList            *gdk_default_filters;
@@ -288,7 +288,7 @@ void   gdk_ic_cleanup                (void);
       
 #endif /* G_ENABLE_DEBUG */
 
-extern guint gdk_debug_flags;
+GDKVAR guint gdk_debug_flags;
 
 
 #ifdef __cplusplus
diff --git a/gdk/win32/gdk-win32.def b/gdk/win32/gdk-win32.def
deleted file mode 100644 (file)
index a839be9..0000000
+++ /dev/null
@@ -1,302 +0,0 @@
-EXPORTS
-       gdk_atom_intern
-       gdk_atom_name
-       gdk_beep
-       gdk_bitmap_create_from_data
-       gdk_char_height
-       gdk_char_measure
-       gdk_char_width
-       gdk_char_width_wc
-       gdk_color_alloc
-       gdk_color_black
-       gdk_color_change
-       gdk_color_copy
-       gdk_color_equal
-       gdk_color_free
-       gdk_color_hash
-       gdk_color_parse
-       gdk_color_white
-       gdk_colormap_alloc_color
-       gdk_colormap_alloc_colors
-       gdk_colormap_change
-       gdk_colormap_free_colors
-       gdk_colormap_get_system
-       gdk_colormap_get_system_size
-       gdk_colormap_get_visual
-       gdk_colormap_new
-       gdk_colormap_ref
-       gdk_colormap_unref
-       gdk_colors_alloc
-       gdk_colors_free
-       gdk_colors_store
-       gdk_cursor_destroy
-       gdk_cursor_new
-       gdk_cursor_new_from_pixmap
-       gdk_debug_flags
-       gdk_dnd_init
-       gdk_drag_abort
-       gdk_drag_begin
-       gdk_drag_context_new
-       gdk_drag_context_ref
-       gdk_drag_context_unref
-       gdk_drag_drop
-       gdk_drag_find_window
-       gdk_drag_get_protocol
-       gdk_drag_get_selection
-       gdk_drag_motion
-       gdk_drag_status
-       gdk_drop_finish
-       gdk_drop_reply
-       gdk_draw_arc
-       gdk_draw_gray_image
-       gdk_draw_image
-       gdk_draw_indexed_image
-       gdk_draw_line
-       gdk_draw_lines
-       gdk_draw_point
-       gdk_draw_points
-       gdk_draw_polygon
-       gdk_draw_rectangle
-       gdk_draw_rgb_32_image
-       gdk_draw_rgb_image
-       gdk_draw_rgb_image_dithalign
-       gdk_draw_segments
-       gdk_draw_string
-       gdk_draw_text
-       gdk_draw_text_wc
-       gdk_drawable_get_colormap
-       gdk_drawable_get_size
-       gdk_drawable_get_type
-       gdk_drawable_get_visual
-       gdk_drawable_set_colormap
-       gdk_drawable_set_data
-       gdk_error_code
-       gdk_error_trap_pop
-       gdk_error_trap_push
-       gdk_error_warnings
-       gdk_event_copy
-       gdk_event_free
-       gdk_event_get
-       gdk_event_get_graphics_expose
-       gdk_event_get_time
-       gdk_event_handler_set
-       gdk_event_peek
-       gdk_event_put
-       gdk_event_send_client_message
-       gdk_event_send_clientmessage_toall
-       gdk_events_pending
-       gdk_exit
-       gdk_flush
-       gdk_font_equal
-       gdk_font_id
-       gdk_font_list_free
-       gdk_font_list_new
-       gdk_font_load
-       gdk_font_ref
-       gdk_font_unref
-       gdk_font_xlfd_create
-       gdk_font_xlfd_free
-       gdk_fontset_load
-       gdk_free_compound_text
-       gdk_free_text_list
-       gdk_gc_copy
-       gdk_gc_get_values
-       gdk_gc_new
-       gdk_gc_new_with_values
-       gdk_gc_ref
-       gdk_gc_set_background
-       gdk_gc_set_clip_mask
-       gdk_gc_set_clip_origin
-       gdk_gc_set_clip_rectangle
-       gdk_gc_set_clip_region
-       gdk_gc_set_dashes
-       gdk_gc_set_exposures
-       gdk_gc_set_fill
-       gdk_gc_set_font
-       gdk_gc_set_foreground
-       gdk_gc_set_function
-       gdk_gc_set_line_attributes
-       gdk_gc_set_stipple
-       gdk_gc_set_subwindow
-       gdk_gc_set_tile
-       gdk_gc_set_ts_origin
-       gdk_gc_unref
-       gdk_get_display
-       gdk_get_show_events
-       gdk_get_use_xshm
-       gdk_ic_destroy
-       gdk_ic_get_attr
-       gdk_ic_get_events
-       gdk_ic_get_style
-       gdk_ic_get_values
-       gdk_ic_new
-       gdk_ic_set_attr
-       gdk_ic_set_values
-       gdk_im_begin
-       gdk_im_decide_style
-       gdk_im_end
-       gdk_im_ready
-       gdk_im_set_best_style
-       gdk_image_bitmap_new
-       gdk_image_get
-       gdk_image_get_pixel
-       gdk_image_new
-       gdk_image_new_bitmap
-       gdk_image_put_pixel
-       gdk_init
-       gdk_init_check
-       gdk_input_add
-       gdk_input_add_full
-       gdk_input_exit
-       gdk_input_init
-       gdk_input_list_devices
-       gdk_input_motion_events
-       gdk_input_remove
-       gdk_input_set_axes
-       gdk_input_set_extension_events
-       gdk_input_set_key
-       gdk_input_set_mode
-       gdk_input_set_source
-       gdk_input_window_get_pointer
-       gdk_key_repeat_disable
-       gdk_key_repeat_restore
-       gdk_keyboard_grab
-       gdk_keyboard_ungrab
-       gdk_keyval_from_name
-       gdk_keyval_is_lower
-       gdk_keyval_is_upper
-       gdk_keyval_name
-       gdk_keyval_to_lower
-       gdk_keyval_to_upper
-       gdk_list_visuals
-       gdk_mbstowcs
-       gdk_null_window_warnings
-       gdk_pixmap_colormap_create_from_xpm
-       gdk_pixmap_colormap_create_from_xpm_d
-       gdk_pixmap_create_from_data
-       gdk_pixmap_create_from_xpm
-       gdk_pixmap_create_from_xpm_d
-       gdk_pixmap_create_on_shared_image
-       gdk_pixmap_foreign_new
-       gdk_pixmap_new
-       gdk_pointer_grab
-       gdk_pointer_is_grabbed
-       gdk_pointer_ungrab
-       gdk_progclass
-       gdk_property_change
-       gdk_property_delete
-       gdk_property_get
-       gdk_query_depths
-       gdk_query_visual_types
-       gdk_rectangle_intersect
-       gdk_rectangle_union
-       gdk_region_destroy
-       gdk_region_empty
-       gdk_region_equal
-       gdk_region_get_clipbox
-       gdk_region_new
-       gdk_region_offset
-       gdk_region_point_in
-       gdk_region_polygon
-       gdk_region_rect_in
-       gdk_region_shrink
-       gdk_region_union_with_rect
-       gdk_regions_intersect
-       gdk_regions_subtract
-       gdk_regions_union
-       gdk_regions_xor
-       gdk_root_parent
-       gdk_screen_height
-       gdk_screen_height_mm
-       gdk_screen_width
-       gdk_screen_width_mm
-       gdk_selection_convert
-       gdk_selection_owner_get
-       gdk_selection_owner_set
-       gdk_selection_property
-       gdk_selection_property_get
-       gdk_selection_send_notify
-       gdk_set_locale
-       gdk_set_show_events
-       gdk_set_use_xshm
-       gdk_string_extents
-       gdk_string_height
-       gdk_string_measure
-       gdk_string_to_compound_text
-       gdk_string_width
-       gdk_text_extents
-       gdk_text_extents_wc
-       gdk_text_height
-       gdk_text_measure
-       gdk_text_property_to_text_list
-       gdk_text_width
-       gdk_text_width_wc
-       gdk_threads_enter
-       gdk_threads_leave
-       gdk_threads_mutex
-       gdk_visual_get_best
-       gdk_visual_get_best_depth
-       gdk_visual_get_best_type
-       gdk_visual_get_best_with_both
-       gdk_visual_get_best_with_depth
-       gdk_visual_get_best_with_type
-       gdk_visual_get_system
-       gdk_visual_ref
-       gdk_visual_unref
-       gdk_wcstombs
-       gdk_window_add_filter
-       gdk_window_at_pointer
-       gdk_window_clear
-       gdk_window_clear_area
-       gdk_window_clear_area_e
-       gdk_window_destroy
-       gdk_window_foreign_new
-       gdk_window_get_deskrelative_origin
-       gdk_window_get_children
-       gdk_window_get_events
-       gdk_window_get_geometry
-       gdk_window_get_origin
-       gdk_window_get_parent
-       gdk_window_get_pointer
-       gdk_window_get_position
-       gdk_window_get_root_origin
-       gdk_window_get_toplevel
-       gdk_window_get_toplevels
-       gdk_window_get_user_data
-       gdk_window_hide
-       gdk_window_is_visible
-       gdk_window_is_viewable
-       gdk_window_lower
-       gdk_window_merge_child_shapes
-       gdk_window_move
-       gdk_window_move_resize
-       gdk_window_new
-       gdk_window_raise
-       gdk_window_register_dnd
-       gdk_window_remove_filter
-       gdk_window_reparent
-       gdk_window_resize
-       gdk_window_set_back_pixmap
-       gdk_window_set_background
-       gdk_window_set_child_shapes
-       gdk_window_set_cursor
-       gdk_window_set_decorations
-       gdk_window_set_events
-       gdk_window_set_functions
-       gdk_window_set_geometry_hints
-       gdk_window_set_group
-       gdk_window_set_hints
-       gdk_window_set_icon
-       gdk_window_set_icon_name
-       gdk_window_set_override_redirect
-       gdk_window_set_role
-       gdk_window_set_static_gravities
-       gdk_window_set_title
-       gdk_window_set_transient_for
-       gdk_window_set_user_data
-       gdk_window_shape_combine_mask
-       gdk_window_show
-       gdk_window_withdraw
-       gdk_xid_table_insert
-       gdk_xid_table_lookup
-       gdk_xid_table_remove
\ No newline at end of file
diff --git a/gdk/win32/gdkconfig.h b/gdk/win32/gdkconfig.h
deleted file mode 100644 (file)
index 6dd3dc7..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Handcrafted for Win32 */
-
-#define GDK_WINDOWING_WIN32
-#define GDK_HAVE_WCHAR_H 1
-#ifdef _MSC_VER
-#define GDK_HAVE_WCTYPE_H 1
-#endif
-#define GDK_USE_UTF8_MBS 1
-
index aaf4ab7067487feda6824714209da495bdc64cdb..cf90570e9f17b222c45c62d83e6b1dfd9c6562e1 100644 (file)
@@ -151,8 +151,8 @@ gdk_drawable_set_colormap (GdkDrawable *drawable,
     {
       if (GDK_IS_WINDOW (drawable))
        {
-         g_return_if_fail (colormap_private->visual !=
-                           ((GdkColormapPrivate*)(drawable_private->colormap))->visual);
+         g_return_if_fail (colormap_private->base.visual !=
+                           ((GdkColormapPrivate *) (drawable_private->colormap))->visual);
          /* XXX ??? */
          GDK_NOTE (MISC, g_print ("gdk_drawable_set_colormap: %#x %#x\n",
                                   GDK_DRAWABLE_XID (drawable),
index c14321976561d458b496547c6b48df40a2545f4f..a63bdec2bb650d9d8c2962331927462a1e92774d 100644 (file)
@@ -27,8 +27,6 @@
 
 #include "config.h"
 
-#define NEW_PROPAGATION_CODE
-
 #define USE_DISPATCHMESSAGE
 
 /* Cannot use TrackMouseEvent, as the stupid WM_MOUSELEAVE message
@@ -2747,39 +2745,6 @@ synthesize_crossing_events (GdkWindow *window,
 #endif
 }
 
-#ifndef NEW_PROPAGATION_CODE
-
-static GdkWindow *
-key_propagate (GdkWindow *window,
-              MSG       *xevent)
-{
-  gdk_window_unref (window);
-  window = ((GdkWindowPrivate *) window)->parent;
-  gdk_window_ref (window);
-
-  return window;
-}  
-
-static GdkWindow *
-pointer_propagate (GdkWindow *window,
-                  MSG       *xevent)
-{
-  POINT pt;
-
-  pt.x = LOWORD (xevent->lParam);
-  pt.y = HIWORD (xevent->lParam);
-  ClientToScreen (GDK_DRAWABLE_XID (window), &pt);
-  gdk_window_unref (window);
-  window = ((GdkWindowPrivate *) window)->parent;
-  gdk_window_ref (window);
-  ScreenToClient (GDK_DRAWABLE_XID (window), &pt);
-  xevent->lParam = MAKELPARAM (pt.x, pt.y);
-
-  return window;
-}
-
-#endif /* !NEW_PROPAGATION_CODE */
-
 static void
 translate_mouse_coords (GdkWindow *window1,
                        GdkWindow *window2,
@@ -2795,8 +2760,6 @@ translate_mouse_coords (GdkWindow *window1,
   GDK_NOTE (EVENTS, g_print ("...new coords are (%d,%d)\n", pt.x, pt.y));
 }
 
-#ifdef NEW_PROPAGATION_CODE
-
 static gboolean
 propagate (GdkWindow  **window,
           MSG         *xevent,
@@ -2924,8 +2887,6 @@ doesnt_want_button_motion (gint mask,
               && (mask & GDK_BUTTON3_MOTION_MASK)));
 }
 
-#endif
-
 static gboolean
 gdk_event_translate (GdkEvent *event,
                     MSG      *xevent,
@@ -3161,55 +3122,11 @@ gdk_event_translate (GdkEvent *event,
       ignore_WM_CHAR = TRUE;
     keyup_or_down:
 
-#ifdef NEW_PROPAGATION_CODE
       if (!propagate (&window, xevent,
                      k_grab_window, k_grab_owner_events, GDK_ALL_EVENTS_MASK,
                      doesnt_want_key))
          break;
       event->key.window = window;
-#else
-      if (k_grab_window != NULL && !k_grab_owner_events)
-       {
-         /* Keyboard is grabbed with owner_events FALSE */
-         GDK_NOTE (EVENTS, g_print ("...grabbed, owner_events FALSE, "
-                                    "sending to %#x\n",
-                                    GDK_DRAWABLE_XID (k_grab_window)));
-         event->key.window = k_grab_window;
-         /* Continue with switch statement below */
-       }
-      else if (((xevent->message == WM_KEYUP
-                    || xevent->message == WM_SYSKEYUP)
-                   && !(GDK_WINDOW_WIN32DATA(window)->event_mask & GDK_KEY_RELEASE_MASK))
-                  || ((xevent->message == WM_KEYDOWN
-                       || xevent->message == WM_SYSKEYDOWN)
-                      && !(GDK_WINDOW_WIN32DATA(window)->event_mask & GDK_KEY_PRESS_MASK)))
-       {
-         /* Owner doesn't want it, propagate to parent. */
-         if (((GdkWindowPrivate *) window)->parent == (GdkWindow *) gdk_root_parent)
-           {
-             /* No parent; check if grabbed */
-             if (k_grab_window != NULL)
-               {
-                 /* Keyboard is grabbed with owner_events TRUE */
-                 GDK_NOTE (EVENTS, g_print ("...undelivered, but grabbed\n"));
-                 event->key.window = k_grab_window;
-                 /* Continue with switch statement below */
-               }
-             else
-               break;
-           }
-         else
-           {
-             window = key_propagate (window, xevent);
-             /* Jump back up */
-             goto keyup_or_down;
-           }
-       }
-      else
-       event->key.window = window;
-
-      g_assert (event->key.window == window);
-#endif       
       switch (xevent->wParam)
        {
        case VK_LBUTTON:
@@ -3445,52 +3362,11 @@ gdk_event_translate (GdkEvent *event,
        }
 
     wm_char:
-#ifdef NEW_PROPAGATION_CODE
       if (!propagate (&window, xevent,
                      k_grab_window, k_grab_owner_events, GDK_ALL_EVENTS_MASK,
                      doesnt_want_char))
          break;
       event->key.window = window;
-#else
-      /* This doesn't handle the rather theorethical case that a window
-       * wants key presses but still wants releases to be propagated,
-       * for instance. Or is that so theorethical?
-       */
-      if (k_grab_window != NULL && !k_grab_owner_events)
-       {
-         /* Keyboard is grabbed with owner_events FALSE */
-         GDK_NOTE (EVENTS,
-                   g_print ("...grabbed, owner_events FALSE, "
-                            "sending to %#x\n",
-                            GDK_DRAWABLE_XID (k_grab_window)));
-         event->key.window = k_grab_window;
-       }
-      else if (!(GDK_WINDOW_WIN32DATA(window)->event_mask & (GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK)))
-       {
-         /* Owner doesn't want it, propagate to parent. */
-         if (((GdkWindowPrivate *) window)->parent == (GdkWindow *) gdk_root_parent)
-           {
-             /* No parent; check if grabbed */
-             if (k_grab_window != NULL)
-               {
-                 GDK_NOTE (EVENTS, g_print ("...undelivered, but grabbed\n"));
-                 event->key.window = k_grab_window;
-               }
-             else
-               break;
-           }
-         else
-           {
-             window = key_propagate (window, xevent);
-             /* Jump back up */
-             goto wm_char;
-           }
-       }
-      else
-       event->key.window = window;
-
-      g_assert (event->key.window == window);
-#endif
       return_val = !GDK_DRAWABLE_DESTROYED (window);
       if (return_val && (event->key.window == k_grab_window
                         || (GDK_WINDOW_WIN32DATA(window)->event_mask & GDK_KEY_RELEASE_MASK)))
@@ -3556,67 +3432,11 @@ gdk_event_translate (GdkEvent *event,
        synthesize_crossing_events (window, xevent);
 
       event->button.type = GDK_BUTTON_PRESS;
-#ifdef NEW_PROPAGATION_CODE
       if (!propagate (&window, xevent,
                      p_grab_window, p_grab_owner_events, p_grab_mask,
                      doesnt_want_button_press))
          break;
       event->button.window = window;
-#else
-    buttondown:
-      mask = ((GdkWindowPrivate *) window)->event_mask;
-
-      if (p_grab_window != NULL && !p_grab_owner_events)
-       {
-         /* Pointer is grabbed with owner_events FALSE */
-         GDK_NOTE (EVENTS, g_print ("...grabbed, owner_events FALSE\n"));
-
-         mask = p_grab_mask;
-         if (!(mask & GDK_BUTTON_PRESS_MASK))
-           /* Grabber doesn't want it */
-           break;
-         else
-           event->button.window = p_grab_window;
-         GDK_NOTE (EVENTS, g_print ("...sending to %#x\n",
-                                    GDK_DRAWABLE_XID (p_grab_window)));
-       }
-      else if (!(mask & GDK_BUTTON_PRESS_MASK))
-       {
-         /* Owner doesn't want it, propagate to parent. */
-         if (((GdkWindowPrivate *) window)->parent == gdk_parent_root)
-           {
-             /* No parent; check if grabbed */
-             if (p_grab_window != NULL)
-               {
-                 /* Pointer is grabbed wíth owner_events TRUE */
-                 GDK_NOTE (EVENTS, g_print ("...undelivered, but grabbed\n"));
-                 mask = p_grab_mask;
-                 if (!(mask & GDK_BUTTON_PRESS_MASK))
-                   {
-                     /* Grabber doesn't want it either */
-                     GDK_NOTE (EVENTS, g_print ("...grabber uninterested\n"));
-                     break;
-                   }
-                 else
-                   event->button.window = p_grab_window;
-                 GDK_NOTE (EVENTS, g_print ("...sending to %#x\n",
-                                            GDK_DRAWABLE_XID (p_grab_window)));
-               }
-             else
-               break;
-           }
-         else
-           {
-             window = pointer_propagate (window, xevent);
-             /* Jump back up */
-             goto buttondown; /* What did Dijkstra say? */
-           }
-       }
-      else
-       event->button.window = window;
-
-      g_assert (event->button.window == window);
-#endif
       /* Emulate X11's automatic active grab */
       if (!p_grab_window)
        {
@@ -3680,68 +3500,11 @@ gdk_event_translate (GdkEvent *event,
        synthesize_crossing_events (window, xevent);
 
       event->button.type = GDK_BUTTON_RELEASE;
-#ifdef NEW_PROPAGATION_CODE
       if (!propagate (&window, xevent,
                      p_grab_window, p_grab_owner_events, p_grab_mask,
                      doesnt_want_button_release))
          goto maybe_ungrab;
       event->button.window = window;
-#else
-    buttonup:
-      mask = GDK_WINDOW_WIN32DATA(window)->event_mask;
-
-      if (p_grab_window != NULL && !p_grab_owner_events)
-       {
-         /* Pointer is grabbed with owner_events FALSE */
-         GDK_NOTE (EVENTS, g_print ("...grabbed, owner_events FALSE\n"));
-
-         mask = p_grab_mask;
-         if (!(mask & GDK_BUTTON_RELEASE_MASK))
-           /* Grabber doesn't want it */
-           goto maybe_ungrab;
-         else
-           event->button.window = p_grab_window;
-         GDK_NOTE (EVENTS, g_print ("...sending to %#x\n",
-                                    GDK_DRAWABLE_XID (p_grab_window)));
-       }
-      else if (!(mask & GDK_BUTTON_RELEASE_MASK))
-       {
-         /* Owner doesn't want it, propagate to parent. */
-         if (((GdkWindowPrivate *) window)->parent == gdk_parent_root)
-           {
-             /* No parent; check if grabbed */
-             if (p_grab_window != NULL)
-               {
-                 /* Pointer is grabbed wíth owner_events TRUE */
-                 GDK_NOTE (EVENTS, g_print ("...undelivered, but grabbed\n"));
-                 mask = p_grab_mask;
-                 if (!(mask & GDK_BUTTON_RELEASE_MASK))
-                   {
-                     /* Grabber doesn't want it either */
-                     GDK_NOTE (EVENTS, g_print ("...grabber uninterested\n"));
-                     goto maybe_ungrab;
-                   }
-                 else
-                   event->button.window = p_grab_window;
-                 GDK_NOTE (EVENTS,
-                           g_print ("...sending to %#x\n",
-                                    GDK_DRAWABLE_XID (p_grab_window)));
-               }
-             else
-               break;
-           }
-         else
-           {
-             window = pointer_propagate (window, xevent);
-             /* Jump back up */
-             goto buttonup;
-           }
-       }
-      else
-       event->button.window = window;
-
-      g_assert (event->button.window == window);
-#endif
       event->button.time = xevent->time;
       if (window != orig_window)
        translate_mouse_coords (orig_window, window, xevent);
@@ -3798,90 +3561,11 @@ gdk_event_translate (GdkEvent *event,
        }
 
       event->motion.type = GDK_MOTION_NOTIFY;
-#ifdef NEW_PROPAGATION_CODE
       if (!propagate (&window, xevent,
                      p_grab_window, p_grab_owner_events, p_grab_mask,
                      doesnt_want_button_motion))
          break;
       event->motion.window = window;
-#else
-    mousemotion:
-      mask = GDK_WINDOW_WIN32DATA(window)->event_mask;
-
-      if (p_grab_window != NULL && !p_grab_owner_events)
-       {
-         /* Pointer is grabbed with owner_events FALSE */
-         GDK_NOTE (EVENTS, g_print ("...grabbed, owner_events FALSE\n"));
-
-         mask = p_grab_mask;
-         if (!((mask & GDK_POINTER_MOTION_MASK)
-               || ((xevent->wParam & (MK_LBUTTON|MK_MBUTTON|MK_RBUTTON))
-                   && (mask & GDK_BUTTON_MOTION_MASK))
-               || ((xevent->wParam & MK_LBUTTON)
-                   && (mask & GDK_BUTTON1_MOTION_MASK))
-               || ((xevent->wParam & MK_MBUTTON)
-                   && (mask & GDK_BUTTON2_MOTION_MASK))
-               || ((xevent->wParam & MK_RBUTTON)
-                   && (mask & GDK_BUTTON3_MOTION_MASK))))
-           /* Grabber doesn't want it */
-           break;
-         else
-           event->motion.window = p_grab_window;
-         GDK_NOTE (EVENTS, g_print ("...sending to %#x\n",
-                                    GDK_DRAWABLE_XID (p_grab_window)));
-       }
-      else if (!((mask & GDK_POINTER_MOTION_MASK)
-                || ((xevent->wParam & (MK_LBUTTON|MK_MBUTTON|MK_RBUTTON))
-                    && (mask & GDK_BUTTON_MOTION_MASK))
-                || ((xevent->wParam & MK_LBUTTON)
-                    && (mask & GDK_BUTTON1_MOTION_MASK))
-                || ((xevent->wParam & MK_MBUTTON)
-                    && (mask & GDK_BUTTON2_MOTION_MASK))
-                || ((xevent->wParam & MK_RBUTTON)
-                    && (mask & GDK_BUTTON3_MOTION_MASK))))
-       {
-         /* Owner doesn't want it, propagate to parent. */
-         if (((GdkWindowPrivate *) window)->parent == gdk_parent_root)
-           {
-             /* No parent; check if grabbed */
-             if (p_grab_window != NULL)
-               {
-                 /* Pointer is grabbed wíth owner_events TRUE */
-                 GDK_NOTE (EVENTS, g_print ("...undelivered, but grabbed\n"));
-                 mask = p_grab_mask;
-                 if (!((p_grab_mask & GDK_POINTER_MOTION_MASK)
-                       || ((xevent->wParam & (MK_LBUTTON|MK_MBUTTON|MK_RBUTTON))
-                           && (mask & GDK_BUTTON_MOTION_MASK))
-                       || ((xevent->wParam & MK_LBUTTON)
-                           && (mask & GDK_BUTTON1_MOTION_MASK))
-                       || ((xevent->wParam & MK_MBUTTON)
-                           && (mask & GDK_BUTTON2_MOTION_MASK))
-                       || ((xevent->wParam & MK_RBUTTON)
-                           && (mask & GDK_BUTTON3_MOTION_MASK))))
-                   {
-                     /* Grabber doesn't want it either */
-                     GDK_NOTE (EVENTS, g_print ("...grabber uninterested\n"));
-                     break;
-                   }
-                 else
-                   event->motion.window = p_grab_window;
-                 GDK_NOTE (EVENTS,
-                           g_print ("...sending to %#x\n",
-                                    GDK_DRAWABLE_XID (p_grab_window)));
-               }
-             else
-               break;
-           }
-         else
-           {
-             window = pointer_propagate (window, xevent);
-             /* Jump back up */
-             goto mousemotion;
-           }
-       }
-      else
-       event->motion.window = window;
-#endif
       event->motion.time = xevent->time;
       if (window != orig_window)
        translate_mouse_coords (orig_window, window, xevent);
index bc9cf7bac71c7ff45211bef05cf3700721501315..994ac9d8f39d1ac954d9716a1e84c39928359a1f 100644 (file)
@@ -252,7 +252,7 @@ logfont_to_xlfd (const LOGFONT *lfp,
 }
 
 gchar *
-gdk_font_xlfd_create (GdkFont *font)
+gdk_font_full_name_get (GdkFont *font)
 {
   GdkFontPrivateWin32 *private;
   GdkWin32SingleFont *singlefont;
@@ -274,7 +274,7 @@ gdk_font_xlfd_create (GdkFont *font)
 
       if (GetObject (singlefont->xfont, sizeof (LOGFONT), &logfont) == 0)
        {
-         g_warning ("gdk_win32_font_xlfd: GetObject failed");
+         g_warning ("gdk_font_full_name_get: GetObject failed");
          return NULL;
        }
 
@@ -291,9 +291,9 @@ gdk_font_xlfd_create (GdkFont *font)
 }
 
 void
-gdk_font_xlfd_free (gchar *xlfd)
+gdk_font_full_name_free (gchar *name)
 {
-  g_free (xlfd);
+  g_free (name);
 }
 
 static gboolean
index c6c2f32010c71535f4c1039dd55003c0b38080f6..9521be9886303efe139fb331a181bf5e054ef114 100644 (file)
@@ -443,9 +443,9 @@ gdk_win32_gc_set_values (GdkGC           *gc,
       data->font = values->font;
       if (data->font != NULL)
        {
-         GDK_NOTE (MISC, (xlfd = gdk_font_xlfd_create (data->font),
+         GDK_NOTE (MISC, (xlfd = gdk_font_full_name_get (data->font),
                           g_print ("font = %s ", xlfd),
-                          gdk_font_xlfd_free (xlfd)));
+                          gdk_font_full_name_free (xlfd)));
          gdk_font_ref (data->font);
          data->values_mask |= GDK_GC_FONT;
        }
@@ -847,7 +847,7 @@ gdk_gc_predraw (GdkDrawable  *drawable,
     }
   else
     {
-      visual = colormap_private->visual;
+      visual = colormap_private->base.visual;
       r = (data->foreground.pixel & visual->red_mask) >> visual->red_shift;
       r = (r * 255) / mask[visual->red_prec];
       g = (data->foreground.pixel & visual->green_mask) >> visual->green_shift;
@@ -915,7 +915,7 @@ gdk_gc_predraw (GdkDrawable  *drawable,
        }
       else
        {
-         visual = colormap_private->visual;
+         visual = colormap_private->base.visual;
          r = (data->background.pixel & visual->red_mask) >> visual->red_shift;
          r = (r * 255) / mask[visual->red_prec];
          g = (data->background.pixel & visual->green_mask) >> visual->green_shift;
index 8cf53f7ca37290370ccea5e49665946f7dc8a319..f85efa73b80b62285c453a5b937629c728460c27 100644 (file)
@@ -241,7 +241,6 @@ struct _GdkColormapPrivateWin32
 {
   GdkColormapPrivate base;
   Colormap xcolormap;
-  GdkVisual *visual;
   gint private_val;
 
   GHashTable *hash;
index 6cc05a7413bdc052be487d2d8fd67b51fcaaeded..3882a15077859cc95e45b76cb86c065b748c82c3 100644 (file)
 #include <locale.h>
 
 #define GDK_ROOT_WINDOW()             ((guint32) HWND_DESKTOP)
-#define GDK_ROOT_PARENT()             ((GdkWindow *) gdk_root_parent)
+#define GDK_ROOT_PARENT()             ((GdkWindow *) gdk_parent_root)
 #define GDK_DISPLAY()                 NULL
-#define GDK_DRAWABLE_XDISPLAY(win)    NULL
 #define GDK_DRAWABLE_XID(win)         (GDK_DRAWABLE_WIN32DATA(win)->xid)
-#define GDK_IMAGE_XDISPLAY(image)     NULL
-#define GDK_IMAGE_XIMAGE(image)       (((GdkImagePrivate*) image)->ximage)
-#define GDK_GC_XDISPLAY(gc)           NULL
-#define GDK_GC_XGC(gc)                (((GdkGCPrivate*) gc)->xgc)
+#define GDK_IMAGE_XIMAGE(image)       (((GdkImagePrivate *) image)->ximage)
 #define GDK_COLORMAP_XDISPLAY(cmap)   NULL
-#define GDK_COLORMAP_XCOLORMAP(cmap)  (((GdkColormapPrivate*) cmap)->xcolormap)
-#define GDK_VISUAL_XVISUAL(vis)       (((GdkVisualPrivate*) vis)->xvisual)
+#define GDK_COLORMAP_WIN32COLORMAP(cmap)(((GdkColormapPrivateWin32 *) cmap)->xcolormap)
+#define GDK_VISUAL_XVISUAL(vis)       (((GdkVisualPrivate *) vis)->xvisual)
 
 #define GDK_WINDOW_XDISPLAY          GDK_DRAWABLE_XDISPLAY
 #define GDK_WINDOW_XWINDOW           GDK_DRAWABLE_XID
index 1f466ae40b3aa27d7a32a9c1ef4c449096d4b7c0..d0d3a7a2dcfa3e3eca4d13e10b833cfcb2e1128c 100644 (file)
@@ -104,7 +104,7 @@ gdk_win32_window_alloc (void)
   private = (GdkWindowPrivate *) window;
 
   private->drawable.klass = &klass;
-  private->drawable.klass_data = g_new (GdkDrawableWin32Data, 1);
+  private->drawable.klass_data = g_new (GdkWindowWin32Data, 1);
 
   GDK_WINDOW_WIN32DATA (window)->event_mask = 0;
   GDK_WINDOW_WIN32DATA (window)->bg_type = GDK_WIN32_BG_NORMAL;
index 7ee3bd2827ada150e1bdf6ec035399ca4d20e9c4..4af3a25619c2c7eee40ac6663f97fabd665924f0 100644 (file)
@@ -30,6 +30,7 @@ all: \
        libwntab32x.a
 
 gdk_win32_OBJECTS = \
+       gdkcc-win32.o \
        gdkcolor-win32.o \
        gdkcursor-win32.o \
        gdkdnd-win32.o \